From b8a015afa9cb1497447d8c3e36c696837e9a2d32 Mon Sep 17 00:00:00 2001 From: "Jan D." Date: Fri, 6 Jul 2012 17:02:29 +0200 Subject: [PATCH] * gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3 is defined. --- src/ChangeLog | 7 ++++++- src/gtkutil.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 26698570b87..0468ac45f4b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-06 Jan Djärv + + * gtkutil.c (xg_event_is_for_scrollbar): Assign gwin when HAVE_GTK3 + is defined (Bug#11768). + 2012-07-06 Dmitry Antipov Fix marker debugging code. @@ -122,7 +127,7 @@ (xg_event_is_for_scrollbar): Use Gdk Device functions for HAVE_GTK3. (is_box_type): New function (Bug#11768). (xg_tool_item_stale_p): Call is_box_type. - (xg_initialize): Get settings by calling gtk_settings_get_for_screen + (xg_initialize): Get settings by calli diff --git a/src/gtkutil.c b/src/gtkutil.c index 82c7d643551..f4551b4b9f7 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3730,7 +3730,7 @@ xg_event_is_for_scrollbar (FRAME_PTR f, XEvent *event) #ifdef HAVE_GTK3 GdkDevice *gdev = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gdpy)); - gdk_device_get_window_at_position (gdev, NULL, NULL); + gwin = gdk_device_get_window_at_position (gdev, NULL, NULL); #else gwin = gdk_display_get_window_at_pointer (gdpy, NULL, NULL); #endif -- 2.30.2